From e88dc64c1861db20530418354e57a7438e7455e9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 11 Oct 2013 14:29:18 -0400 Subject: [PATCH] * configure.ac (LIBGNUTLS): Don't set LIBGNUTLS_* back to the empty string when gnutls2 is installed but gnutls3 is not. --- ChangeLog | 5 +++++ configure.ac | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cd0f43070a..b1d0046fbec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-11 Stefan Monnier + + * configure.ac (LIBGNUTLS): Don't set LIBGNUTLS_* back to the empty + string when gnutls2 is installed but gnutls3 is not. + 2013-10-11 Teodor Zlatanov * configure.ac: Define HAVE_GNUTLS3 if GnuTLS v3 is found. diff --git a/configure.ac b/configure.ac index fd0c2d9b92c..40da4af157e 100644 --- a/configure.ac +++ b/configure.ac @@ -2424,14 +2424,15 @@ AC_SUBST(LIBSELINUX_LIBS) HAVE_GNUTLS=no HAVE_GNUTLS3=no if test "${with_gnutls}" = "yes" ; then - PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes, HAVE_GNUTLS=no) PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.0.0], HAVE_GNUTLS3=yes, HAVE_GNUTLS3=no) - if test "${HAVE_GNUTLS}" = "yes"; then - AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.]) - fi - if test "${HAVE_GNUTLS3}" = "yes"; then AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.]) + HAVE_GNUTLS="yes" + else + PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes, HAVE_GNUTLS=no) + fi + if test "${HAVE_GNUTLS}" = "yes"; then + AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.]) fi # Windows loads GnuTLS dynamically -- 2.30.2